remove unconditional warnings about missing X locale support. Gdk properly

Thu Feb 23 13:28:21 2006  Tim Janik  <timj@imendio.com>

        * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): remove unconditional
        warnings about missing X locale support. Gdk properly handles this
        situation anyway.

diff --git a/ChangeLog b/ChangeLog
index de3bb6d8c5a2673c79e829348cba635c7c7c9f85..b80ebbdf53a9f1fb7dbacd86582b54ac600c0c3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 23 13:28:21 2006  Tim Janik  <timj@imendio.com>
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): remove unconditional
+       warnings about missing X locale support. Gdk properly handles this
+       situation anyway.
+
 Fri Feb 17 14:20:29 2006  Tim Janik  <timj@imendio.com>
 
        * gtk/gtktreemodel.h: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index de3bb6d8c5a2673c79e829348cba635c7c7c9f85..b80ebbdf53a9f1fb7dbacd86582b54ac600c0c3d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Feb 23 13:28:21 2006  Tim Janik  <timj@imendio.com>
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): remove unconditional
+       warnings about missing X locale support. Gdk properly handles this
+       situation anyway.
+
 Fri Feb 17 14:20:29 2006  Tim Janik  <timj@imendio.com>
 
        * gtk/gtktreemodel.h: 

diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index 0ee7356531530ded634d775fb90d80a68acdde08..028befb4d8af73f4454bce4621a421547f9561d0 100644 (file)
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -62,11 +62,8 @@ _gdk_x11_initialize_locale (void)
   g_free (last_locale);
   last_locale = g_strdup (current_locale);
 
-  if (!XSupportsLocale ())
-    g_warning ("locale not supported by Xlib");
-  
-  if (!XSetLocaleModifiers (""))
-    g_warning ("cannot set locale modifiers");
+  if (XSupportsLocale ())
+    XSetLocaleModifiers ("");
 
   if ((strcmp (current_locale, "C")) && (strcmp (current_locale, "POSIX")))
     {